]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
layout: Trigger the tray if one event passes the threshold
authorJasper St. Pierre <jstpierre@mecheye.net>
Thu, 21 Feb 2013 22:21:25 +0000 (17:21 -0500)
committerJasper St. Pierre <jstpierre@mecheye.net>
Wed, 27 Feb 2013 19:01:42 +0000 (14:01 -0500)
As a special-case to the "cap event" rules, this allows a heavy swipe
from top to bottom to allow triggering the tray without having to push
into it.

https://bugzilla.gnome.org/show_bug.cgi?id=694467

js/ui/layout.js

index f8b91b73a20fefce88ff38981155b6d6a5383768..ef4273d09ab8b610bb875809474dbe6be8da0a5b 100644 (file)
@@ -1303,6 +1303,11 @@ const PressureBarrier = new Lang.Class({
         this._reset();
     },
 
+    _trigger: function() {
+        this.emit('trigger');
+        this._reset();
+    },
+
     _onBarrierHit: function(barrier, event) {
         // Throw out all events where the pointer was grabbed by another
         // client, as the client that grabbed the pointer expects to have
@@ -1320,6 +1325,11 @@ const PressureBarrier = new Lang.Class({
         let slide = this._getDistanceAlongBarrier(event);
         let distance = this._getDistanceAcrossBarrier(event);
 
+        if (distance >= this._threshold) {
+            this._trigger();
+            return;
+        }
+
         // Throw out events where the cursor is move more
         // along the axis of the barrier than moving with
         // the barrier.
@@ -1332,10 +1342,8 @@ const PressureBarrier = new Lang.Class({
         this._barrierEvents.push(event);
         this._currentPressure += Math.min(15, distance);
 
-        if (this._currentPressure >= this._threshold) {
-            this.emit('trigger');
-            this._reset();
-        }
+        if (this._currentPressure >= this._threshold)
+            this._trigger();
     }
 });
 Signals.addSignalMethods(PressureBarrier.prototype);